From 87544a1a52c598026ab466c46a35d1bbacd9e109 Mon Sep 17 00:00:00 2001 From: =?utf8?q?IOhannes=20m=20zm=C3=B6lnig?= Date: Wed, 8 Nov 2017 21:25:00 +0100 Subject: [PATCH] Refreshed patches, dropped those applied upstream --- .../debian_apply-reproducible-date.patch | 8 +- debian/patches/debian_do-not-track.patch | 23 - debian/patches/debian_fixed-defines.patch | 6 +- debian/patches/debian_make-projucer.patch | 434 ------------------ .../patches/debian_projucer-modulepath.patch | 18 - debian/patches/fix-build-libpng16.patch | 30 -- debian/patches/no-ztypes.patch | 18 - debian/patches/projucer-makegenerator.patch | 125 ----- debian/patches/reproducible-date.patch | 8 +- debian/patches/series | 6 - 10 files changed, 11 insertions(+), 665 deletions(-) delete mode 100644 debian/patches/debian_do-not-track.patch delete mode 100644 debian/patches/debian_make-projucer.patch delete mode 100644 debian/patches/debian_projucer-modulepath.patch delete mode 100644 debian/patches/fix-build-libpng16.patch delete mode 100644 debian/patches/no-ztypes.patch delete mode 100644 debian/patches/projucer-makegenerator.patch diff --git a/debian/patches/debian_apply-reproducible-date.patch b/debian/patches/debian_apply-reproducible-date.patch index d803b09a..59ac073c 100644 --- a/debian/patches/debian_apply-reproducible-date.patch +++ b/debian/patches/debian_apply-reproducible-date.patch @@ -7,11 +7,11 @@ Last-Update: 2016-02-10 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ --- juce.orig/extras/Projucer/JuceLibraryCode/AppConfig.h +++ juce/extras/Projucer/JuceLibraryCode/AppConfig.h -@@ -18,6 +18,7 @@ - // [BEGIN_USER_CODE_SECTION] +@@ -36,6 +36,7 @@ - // (You can add your own code in this section, and the Projucer will not overwrite it) -+#include "../../../debian/libbuilder/build/libjuce_builddate.h" + // END SECTION A ++#include "../../../debian/libbuilder/build/libjuce_builddate.h" // [END_USER_CODE_SECTION] + /* diff --git a/debian/patches/debian_do-not-track.patch b/debian/patches/debian_do-not-track.patch deleted file mode 100644 index b455f964..00000000 --- a/debian/patches/debian_do-not-track.patch +++ /dev/null @@ -1,23 +0,0 @@ -Description: do not track! - remove tracking code (google analytics) from the documentation. -Author: IOhannes m zmölnig -Last-Update: 2015-12-21 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- juce.orig/doxygen/footer.html -+++ juce/doxygen/footer.html -@@ -1,14 +1,4 @@ -
-
All content © ROLI Ltd.

-- - - diff --git a/debian/patches/debian_fixed-defines.patch b/debian/patches/debian_fixed-defines.patch index c605085d..d1a270c1 100644 --- a/debian/patches/debian_fixed-defines.patch +++ b/debian/patches/debian_fixed-defines.patch @@ -12,7 +12,7 @@ Last-Update: 2016-04-07 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ --- juce.orig/modules/juce_core/juce_core.h +++ juce/modules/juce_core/juce_core.h -@@ -71,6 +71,28 @@ +@@ -65,6 +65,28 @@ #include "system/juce_TargetPlatform.h" @@ -43,7 +43,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ --- juce.orig/modules/juce_audio_plugin_client/utility/juce_CheckSettingMacros.h +++ juce/modules/juce_audio_plugin_client/utility/juce_CheckSettingMacros.h -@@ -22,6 +22,30 @@ +@@ -24,6 +24,30 @@ ============================================================================== */ @@ -74,7 +74,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ // The following checks should cause a compile error if you've forgotten to // define all your plugin settings properly.. -@@ -37,6 +61,7 @@ +@@ -39,6 +63,7 @@ #endif #define JUCE_CHECKSETTINGMACROS_H diff --git a/debian/patches/debian_make-projucer.patch b/debian/patches/debian_make-projucer.patch deleted file mode 100644 index 9c05ad37..00000000 --- a/debian/patches/debian_make-projucer.patch +++ /dev/null @@ -1,434 +0,0 @@ -Description: fix make-file to allow additional FLAGS - also print the compiler/linker command before executing it -Author: IOhannes m zmölnig -Last-Update: 2015-01-29 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- juce.orig/extras/Projucer/Builds/LinuxMakefile/Makefile -+++ juce/extras/Projucer/Builds/LinuxMakefile/Makefile -@@ -16,6 +16,8 @@ - CONFIG=Debug - endif - -+LIBJUCE_PATH=../../../../debian/libbuilder/build/ -+ - ifeq ($(CONFIG),Debug) - JUCE_BINDIR := build - JUCE_LIBDIR := build -@@ -23,13 +25,13 @@ - JUCE_OUTDIR := build - - ifeq ($(TARGET_ARCH),) -- TARGET_ARCH := -march=native -+ TARGET_ARCH := - endif - -- JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DDEBUG=1 -D_DEBUG=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=4.3.0 -DJUCE_APP_VERSION_HEX=0x40300 $(shell pkg-config --cflags freetype2 libcurl x11 xext xinerama) -pthread -I../../JuceLibraryCode -I../../../../modules -+ JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DDEBUG=1 -D_DEBUG=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=4.3.0 -DJUCE_APP_VERSION_HEX=0x40300 $(shell pkg-config --cflags freetype2 libcurl x11 xext xinerama) -pthread -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) - JUCE_CFLAGS += $(CFLAGS) $(JUCE_CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 -std=c++11 - JUCE_CXXFLAGS += $(CXXFLAGS) $(JUCE_CFLAGS) -std=c++11 -- JUCE_LDFLAGS += $(LDFLAGS) $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) $(shell pkg-config --libs freetype2 libcurl x11 xext xinerama) -ldl -lpthread -lrt -+ JUCE_LDFLAGS += $(LDFLAGS) $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) -L$(LIBJUCE_PATH) -ljuce_d $(shell pkg-config --libs freetype2 libcurl x11 xext xinerama) -ldl -lpthread -lrt - - TARGET := Projucer - BLDCMD = $(CXX) -o $(JUCE_OUTDIR)/$(TARGET) $(OBJECTS) $(JUCE_LDFLAGS) $(RESOURCES) $(TARGET_ARCH) -@@ -43,13 +45,13 @@ - JUCE_OUTDIR := build - - ifeq ($(TARGET_ARCH),) -- TARGET_ARCH := -march=native -+ TARGET_ARCH := - endif - -- JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DNDEBUG=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=4.3.0 -DJUCE_APP_VERSION_HEX=0x40300 $(shell pkg-config --cflags freetype2 libcurl x11 xext xinerama) -pthread -I../../JuceLibraryCode -I../../../../modules -+ JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DNDEBUG=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=4.3.0 -DJUCE_APP_VERSION_HEX=0x40300 $(shell pkg-config --cflags freetype2 libcurl x11 xext xinerama) -pthread -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) - JUCE_CFLAGS += $(CFLAGS) $(JUCE_CPPFLAGS) $(TARGET_ARCH) -O3 -std=c++11 - JUCE_CXXFLAGS += $(CXXFLAGS) $(JUCE_CFLAGS) -std=c++11 -- JUCE_LDFLAGS += $(LDFLAGS) $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) -fvisibility=hidden $(shell pkg-config --libs freetype2 libcurl x11 xext xinerama) -ldl -lpthread -lrt -+ JUCE_LDFLAGS += $(LDFLAGS) $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) -fvisibility=hidden -L$(LIBJUCE_PATH) -ljuce $(shell pkg-config --libs freetype2 libcurl x11 xext xinerama) -ldl -lpthread -lrt - - TARGET := Projucer - BLDCMD = $(CXX) -o $(JUCE_OUTDIR)/$(TARGET) $(OBJECTS) $(JUCE_LDFLAGS) $(RESOURCES) $(TARGET_ARCH) -@@ -106,13 +108,6 @@ - $(JUCE_OBJDIR)/jucer_NewFileWizard_fac97f47.o \ - $(JUCE_OBJDIR)/jucer_NewProjectWizardClasses_891f6fa2.o \ - $(JUCE_OBJDIR)/BinaryData_ce4232d4.o \ -- $(JUCE_OBJDIR)/juce_core_75b14332.o \ -- $(JUCE_OBJDIR)/juce_cryptography_6de2ebff.o \ -- $(JUCE_OBJDIR)/juce_data_structures_72d3da2c.o \ -- $(JUCE_OBJDIR)/juce_events_d2be882c.o \ -- $(JUCE_OBJDIR)/juce_graphics_9c18891e.o \ -- $(JUCE_OBJDIR)/juce_gui_basics_8a6da59c.o \ -- $(JUCE_OBJDIR)/juce_gui_extra_4a026f23.o \ - - .PHONY: clean - -@@ -121,7 +116,7 @@ - -@mkdir -p $(JUCE_BINDIR) - -@mkdir -p $(JUCE_LIBDIR) - -@mkdir -p $(JUCE_OUTDIR) -- @$(BLDCMD) -+ $(BLDCMD) - - check-pkg-config: - @command -v pkg-config >/dev/null 2>&1 || { echo >&2 "pkg-config not installed. Please, install it."; exit 1; } -@@ -129,290 +124,290 @@ - - clean: - @echo Cleaning Projucer -- @$(CLEANCMD) -+ $(CLEANCMD) - - strip: - @echo Stripping Projucer -- -@$(STRIP) --strip-unneeded $(JUCE_OUTDIR)/$(TARGET) -+ -$(STRIP) --strip-unneeded $(JUCE_OUTDIR)/$(TARGET) - - $(JUCE_OBJDIR)/jucer_AppearanceSettings_788d9889.o: ../../Source/Application/jucer_AppearanceSettings.cpp - -@mkdir -p $(JUCE_OBJDIR) - @echo "Compiling jucer_AppearanceSettings.cpp" -- @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(JUCE_OBJDIR)/jucer_AutoUpdater_ca658dc2.o: ../../Source/Application/jucer_AutoUpdater.cpp - -@mkdir -p $(JUCE_OBJDIR) - @echo "Compiling jucer_AutoUpdater.cpp" -- @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(JUCE_OBJDIR)/jucer_CommandLine_f35de107.o: ../../Source/Application/jucer_CommandLine.cpp - -@mkdir -p $(JUCE_OBJDIR) - @echo "Compiling jucer_CommandLine.cpp" -- @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(JUCE_OBJDIR)/jucer_DocumentEditorComponent_695dff1d.o: ../../Source/Application/jucer_DocumentEditorComponent.cpp - -@mkdir -p $(JUCE_OBJDIR) - @echo "Compiling jucer_DocumentEditorComponent.cpp" -- @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(JUCE_OBJDIR)/jucer_DownloadCompileEngineThread_8a38703f.o: ../../Source/Application/jucer_DownloadCompileEngineThread.cpp - -@mkdir -p $(JUCE_OBJDIR) - @echo "Compiling jucer_DownloadCompileEngineThread.cpp" -- @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(JUCE_OBJDIR)/jucer_GlobalPreferences_b0f1bd3d.o: ../../Source/Application/jucer_GlobalPreferences.cpp - -@mkdir -p $(JUCE_OBJDIR) - @echo "Compiling jucer_GlobalPreferences.cpp" -- @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(JUCE_OBJDIR)/jucer_Main_f8488f5b.o: ../../Source/Application/jucer_Main.cpp - -@mkdir -p $(JUCE_OBJDIR) - @echo "Compiling jucer_Main.cpp" -- @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(JUCE_OBJDIR)/jucer_MainWindow_1e163aeb.o: ../../Source/Application/jucer_MainWindow.cpp - -@mkdir -p $(JUCE_OBJDIR) - @echo "Compiling jucer_MainWindow.cpp" -- @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(JUCE_OBJDIR)/jucer_OpenDocumentManager_4c72d210.o: ../../Source/Application/jucer_OpenDocumentManager.cpp - -@mkdir -p $(JUCE_OBJDIR) - @echo "Compiling jucer_OpenDocumentManager.cpp" -- @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(JUCE_OBJDIR)/projucer_CompileEngineClient_542e6b2d.o: ../../Source/LiveBuildEngine/projucer_CompileEngineClient.cpp - -@mkdir -p $(JUCE_OBJDIR) - @echo "Compiling projucer_CompileEngineClient.cpp" -- @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(JUCE_OBJDIR)/projucer_CompileEngineServer_a5a32aa5.o: ../../Source/LiveBuildEngine/projucer_CompileEngineServer.cpp - -@mkdir -p $(JUCE_OBJDIR) - @echo "Compiling projucer_CompileEngineServer.cpp" -- @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(JUCE_OBJDIR)/jucer_SourceCodeEditor_461f5487.o: ../../Source/Code\ Editor/jucer_SourceCodeEditor.cpp - -@mkdir -p $(JUCE_OBJDIR) - @echo "Compiling jucer_SourceCodeEditor.cpp" -- @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(JUCE_OBJDIR)/jucer_ComponentTypeHandler_6bec6262.o: ../../Source/ComponentEditor/components/jucer_ComponentTypeHandler.cpp - -@mkdir -p $(JUCE_OBJDIR) - @echo "Compiling jucer_ComponentTypeHandler.cpp" -- @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(JUCE_OBJDIR)/jucer_ButtonDocument_56c341cc.o: ../../Source/ComponentEditor/documents/jucer_ButtonDocument.cpp - -@mkdir -p $(JUCE_OBJDIR) - @echo "Compiling jucer_ButtonDocument.cpp" -- @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(JUCE_OBJDIR)/jucer_ComponentDocument_92868083.o: ../../Source/ComponentEditor/documents/jucer_ComponentDocument.cpp - -@mkdir -p $(JUCE_OBJDIR) - @echo "Compiling jucer_ComponentDocument.cpp" -- @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(JUCE_OBJDIR)/jucer_ColouredElement_70cbc839.o: ../../Source/ComponentEditor/paintelements/jucer_ColouredElement.cpp - -@mkdir -p $(JUCE_OBJDIR) - @echo "Compiling jucer_ColouredElement.cpp" -- @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(JUCE_OBJDIR)/jucer_PaintElement_653460.o: ../../Source/ComponentEditor/paintelements/jucer_PaintElement.cpp - -@mkdir -p $(JUCE_OBJDIR) - @echo "Compiling jucer_PaintElement.cpp" -- @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(JUCE_OBJDIR)/jucer_PaintElementPath_908894a5.o: ../../Source/ComponentEditor/paintelements/jucer_PaintElementPath.cpp - -@mkdir -p $(JUCE_OBJDIR) - @echo "Compiling jucer_PaintElementPath.cpp" -- @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(JUCE_OBJDIR)/jucer_ComponentLayoutEditor_aeb44f8d.o: ../../Source/ComponentEditor/ui/jucer_ComponentLayoutEditor.cpp - -@mkdir -p $(JUCE_OBJDIR) - @echo "Compiling jucer_ComponentLayoutEditor.cpp" -- @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(JUCE_OBJDIR)/jucer_ComponentOverlayComponent_fd508d63.o: ../../Source/ComponentEditor/ui/jucer_ComponentOverlayComponent.cpp - -@mkdir -p $(JUCE_OBJDIR) - @echo "Compiling jucer_ComponentOverlayComponent.cpp" -- @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(JUCE_OBJDIR)/jucer_EditingPanelBase_6c2ed9ee.o: ../../Source/ComponentEditor/ui/jucer_EditingPanelBase.cpp - -@mkdir -p $(JUCE_OBJDIR) - @echo "Compiling jucer_EditingPanelBase.cpp" -- @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(JUCE_OBJDIR)/jucer_JucerDocumentEditor_2c581e26.o: ../../Source/ComponentEditor/ui/jucer_JucerDocumentEditor.cpp - -@mkdir -p $(JUCE_OBJDIR) - @echo "Compiling jucer_JucerDocumentEditor.cpp" -- @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(JUCE_OBJDIR)/jucer_PaintRoutineEditor_f6ac0344.o: ../../Source/ComponentEditor/ui/jucer_PaintRoutineEditor.cpp - -@mkdir -p $(JUCE_OBJDIR) - @echo "Compiling jucer_PaintRoutineEditor.cpp" -- @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(JUCE_OBJDIR)/jucer_PaintRoutinePanel_c309a0d7.o: ../../Source/ComponentEditor/ui/jucer_PaintRoutinePanel.cpp - -@mkdir -p $(JUCE_OBJDIR) - @echo "Compiling jucer_PaintRoutinePanel.cpp" -- @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(JUCE_OBJDIR)/jucer_ResourceEditorPanel_a558f2e2.o: ../../Source/ComponentEditor/ui/jucer_ResourceEditorPanel.cpp - -@mkdir -p $(JUCE_OBJDIR) - @echo "Compiling jucer_ResourceEditorPanel.cpp" -- @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(JUCE_OBJDIR)/jucer_TestComponent_db757dc4.o: ../../Source/ComponentEditor/ui/jucer_TestComponent.cpp - -@mkdir -p $(JUCE_OBJDIR) - @echo "Compiling jucer_TestComponent.cpp" -- @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(JUCE_OBJDIR)/jucer_BinaryResources_e0f99b46.o: ../../Source/ComponentEditor/jucer_BinaryResources.cpp - -@mkdir -p $(JUCE_OBJDIR) - @echo "Compiling jucer_BinaryResources.cpp" -- @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(JUCE_OBJDIR)/jucer_ComponentLayout_6ea00129.o: ../../Source/ComponentEditor/jucer_ComponentLayout.cpp - -@mkdir -p $(JUCE_OBJDIR) - @echo "Compiling jucer_ComponentLayout.cpp" -- @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(JUCE_OBJDIR)/jucer_GeneratedCode_9ca4ef7e.o: ../../Source/ComponentEditor/jucer_GeneratedCode.cpp - -@mkdir -p $(JUCE_OBJDIR) - @echo "Compiling jucer_GeneratedCode.cpp" -- @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(JUCE_OBJDIR)/jucer_JucerDocument_ff8afcc2.o: ../../Source/ComponentEditor/jucer_JucerDocument.cpp - -@mkdir -p $(JUCE_OBJDIR) - @echo "Compiling jucer_JucerDocument.cpp" -- @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(JUCE_OBJDIR)/jucer_ObjectTypes_4406f01c.o: ../../Source/ComponentEditor/jucer_ObjectTypes.cpp - -@mkdir -p $(JUCE_OBJDIR) - @echo "Compiling jucer_ObjectTypes.cpp" -- @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(JUCE_OBJDIR)/jucer_PaintRoutine_e1e891ee.o: ../../Source/ComponentEditor/jucer_PaintRoutine.cpp - -@mkdir -p $(JUCE_OBJDIR) - @echo "Compiling jucer_PaintRoutine.cpp" -- @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(JUCE_OBJDIR)/jucer_DependencyPathPropertyComponent_4d137229.o: ../../Source/Project/jucer_DependencyPathPropertyComponent.cpp - -@mkdir -p $(JUCE_OBJDIR) - @echo "Compiling jucer_DependencyPathPropertyComponent.cpp" -- @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(JUCE_OBJDIR)/jucer_Module_3f7666a5.o: ../../Source/Project/jucer_Module.cpp - -@mkdir -p $(JUCE_OBJDIR) - @echo "Compiling jucer_Module.cpp" -- @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(JUCE_OBJDIR)/jucer_Project_c131864a.o: ../../Source/Project/jucer_Project.cpp - -@mkdir -p $(JUCE_OBJDIR) - @echo "Compiling jucer_Project.cpp" -- @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(JUCE_OBJDIR)/jucer_ProjectExporter_eefe2e5b.o: ../../Source/Project\ Saving/jucer_ProjectExporter.cpp - -@mkdir -p $(JUCE_OBJDIR) - @echo "Compiling jucer_ProjectExporter.cpp" -- @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(JUCE_OBJDIR)/jucer_ProjectSaver_38b16c25.o: ../../Source/Project\ Saving/jucer_ProjectSaver.cpp - -@mkdir -p $(JUCE_OBJDIR) - @echo "Compiling jucer_ProjectSaver.cpp" -- @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(JUCE_OBJDIR)/jucer_ResourceFile_6af120d3.o: ../../Source/Project\ Saving/jucer_ResourceFile.cpp - -@mkdir -p $(JUCE_OBJDIR) - @echo "Compiling jucer_ResourceFile.cpp" -- @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(JUCE_OBJDIR)/jucer_CodeHelpers_c317179c.o: ../../Source/Utility/jucer_CodeHelpers.cpp - -@mkdir -p $(JUCE_OBJDIR) - @echo "Compiling jucer_CodeHelpers.cpp" -- @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(JUCE_OBJDIR)/jucer_FileHelpers_f98ed0ad.o: ../../Source/Utility/jucer_FileHelpers.cpp - -@mkdir -p $(JUCE_OBJDIR) - @echo "Compiling jucer_FileHelpers.cpp" -- @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(JUCE_OBJDIR)/jucer_Icons_9db2f51e.o: ../../Source/Utility/jucer_Icons.cpp - -@mkdir -p $(JUCE_OBJDIR) - @echo "Compiling jucer_Icons.cpp" -- @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(JUCE_OBJDIR)/jucer_JucerTreeViewBase_d043309d.o: ../../Source/Utility/jucer_JucerTreeViewBase.cpp - -@mkdir -p $(JUCE_OBJDIR) - @echo "Compiling jucer_JucerTreeViewBase.cpp" -- @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(JUCE_OBJDIR)/jucer_MiscUtilities_25b68c82.o: ../../Source/Utility/jucer_MiscUtilities.cpp - -@mkdir -p $(JUCE_OBJDIR) - @echo "Compiling jucer_MiscUtilities.cpp" -- @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(JUCE_OBJDIR)/jucer_ProjucerLookAndFeel_d6c6b28a.o: ../../Source/Utility/jucer_ProjucerLookAndFeel.cpp - -@mkdir -p $(JUCE_OBJDIR) - @echo "Compiling jucer_ProjucerLookAndFeel.cpp" -- @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(JUCE_OBJDIR)/jucer_SlidingPanelComponent_9aa7a2ab.o: ../../Source/Utility/jucer_SlidingPanelComponent.cpp - -@mkdir -p $(JUCE_OBJDIR) - @echo "Compiling jucer_SlidingPanelComponent.cpp" -- @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(JUCE_OBJDIR)/jucer_StoredSettings_26078d2c.o: ../../Source/Utility/jucer_StoredSettings.cpp - -@mkdir -p $(JUCE_OBJDIR) - @echo "Compiling jucer_StoredSettings.cpp" -- @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(JUCE_OBJDIR)/jucer_NewFileWizard_fac97f47.o: ../../Source/Wizards/jucer_NewFileWizard.cpp - -@mkdir -p $(JUCE_OBJDIR) - @echo "Compiling jucer_NewFileWizard.cpp" -- @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(JUCE_OBJDIR)/jucer_NewProjectWizardClasses_891f6fa2.o: ../../Source/Wizards/jucer_NewProjectWizardClasses.cpp - -@mkdir -p $(JUCE_OBJDIR) - @echo "Compiling jucer_NewProjectWizardClasses.cpp" -- @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(JUCE_OBJDIR)/BinaryData_ce4232d4.o: ../../JuceLibraryCode/BinaryData.cpp - -@mkdir -p $(JUCE_OBJDIR) - @echo "Compiling BinaryData.cpp" -- @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(JUCE_OBJDIR)/juce_core_75b14332.o: ../../JuceLibraryCode/juce_core.cpp - -@mkdir -p $(JUCE_OBJDIR) - @echo "Compiling juce_core.cpp" -- @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(JUCE_OBJDIR)/juce_cryptography_6de2ebff.o: ../../JuceLibraryCode/juce_cryptography.cpp - -@mkdir -p $(JUCE_OBJDIR) - @echo "Compiling juce_cryptography.cpp" -- @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(JUCE_OBJDIR)/juce_data_structures_72d3da2c.o: ../../JuceLibraryCode/juce_data_structures.cpp - -@mkdir -p $(JUCE_OBJDIR) - @echo "Compiling juce_data_structures.cpp" -- @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(JUCE_OBJDIR)/juce_events_d2be882c.o: ../../JuceLibraryCode/juce_events.cpp - -@mkdir -p $(JUCE_OBJDIR) - @echo "Compiling juce_events.cpp" -- @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(JUCE_OBJDIR)/juce_graphics_9c18891e.o: ../../JuceLibraryCode/juce_graphics.cpp - -@mkdir -p $(JUCE_OBJDIR) - @echo "Compiling juce_graphics.cpp" -- @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(JUCE_OBJDIR)/juce_gui_basics_8a6da59c.o: ../../JuceLibraryCode/juce_gui_basics.cpp - -@mkdir -p $(JUCE_OBJDIR) - @echo "Compiling juce_gui_basics.cpp" -- @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(JUCE_OBJDIR)/juce_gui_extra_4a026f23.o: ../../JuceLibraryCode/juce_gui_extra.cpp - -@mkdir -p $(JUCE_OBJDIR) - @echo "Compiling juce_gui_extra.cpp" -- @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - -include $(OBJECTS:%.o=%.d) ---- juce.orig/extras/Projucer/JuceLibraryCode/AppConfig.h -+++ juce/extras/Projucer/JuceLibraryCode/AppConfig.h -@@ -50,7 +50,7 @@ - #endif - - #ifndef JUCE_LOG_ASSERTIONS -- #define JUCE_LOG_ASSERTIONS 1 -+// #define JUCE_LOG_ASSERTIONS 1 - #endif - - #ifndef JUCE_CHECK_MEMORY_LEAKS diff --git a/debian/patches/debian_projucer-modulepath.patch b/debian/patches/debian_projucer-modulepath.patch deleted file mode 100644 index 6d8a870b..00000000 --- a/debian/patches/debian_projucer-modulepath.patch +++ /dev/null @@ -1,18 +0,0 @@ -Description: Debian specific search-path for modules -Author: Debian -Forwarded: not-needed -Last-Update: 2015-01-28 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- juce.orig/extras/Projucer/Source/Application/jucer_MainWindow.cpp -+++ juce/extras/Projucer/Source/Application/jucer_MainWindow.cpp -@@ -628,5 +628,9 @@ - f = parent; - } - -+ File debian ("/usr/share/juce"); -+ if (isJuceFolder(debian)) -+ return debian.getChildFile ("modules"); -+ - return File(); - } diff --git a/debian/patches/fix-build-libpng16.patch b/debian/patches/fix-build-libpng16.patch deleted file mode 100644 index e962f860..00000000 --- a/debian/patches/fix-build-libpng16.patch +++ /dev/null @@ -1,30 +0,0 @@ -Description: Fix build with libpng16 - This patch is inspired with the patch available at https://gist.github.com/balr0g/3004353 -Forwarded: https://github.com/julianstorer/JUCE/pull/124 -Author: Gianfranco Costamagna - ---- juce.orig/modules/juce_graphics/image_formats/juce_PNGLoader.cpp -+++ juce/modules/juce_graphics/image_formats/juce_PNGLoader.cpp -@@ -320,7 +320,7 @@ - - static void JUCE_CDECL errorCallback (png_structp p, png_const_charp) - { -- longjmp (*(jmp_buf*) p->error_ptr, 1); -+ setjmp(png_jmpbuf(p)); - } - - static void JUCE_CDECL warningCallback (png_structp, png_const_charp) {} -@@ -442,8 +442,12 @@ - for (size_t y = 0; y < height; ++y) - rows[y] = (png_bytep) (tempBuffer + lineStride * y); - -+ png_bytep trans_alpha; -+ int num_trans; -+ png_color_16p trans_color; -+ png_get_tRNS(pngReadStruct, pngInfoStruct, &trans_alpha, &num_trans, &trans_color); - if (readImageData (pngReadStruct, pngInfoStruct, errorJumpBuf, rows)) -- return createImageFromData ((colorType & PNG_COLOR_MASK_ALPHA) != 0 || pngInfoStruct->num_trans > 0, -+ return createImageFromData ((colorType & PNG_COLOR_MASK_ALPHA) != 0 || num_trans, - (int) width, (int) height, rows); - } - diff --git a/debian/patches/no-ztypes.patch b/debian/patches/no-ztypes.patch deleted file mode 100644 index fb6ae6ea..00000000 --- a/debian/patches/no-ztypes.patch +++ /dev/null @@ -1,18 +0,0 @@ -Description: do not use z_uInt - the zlib/gzip consumers use a type z_uInt, which is nowhere actually defined. - use (uInt) instead -Author: IOhannes m zmölnig -Forwarded: https://github.com/julianstorer/JUCE/pull/124 -Last-Update: 2015-01-21 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- juce.orig/modules/juce_core/zip/juce_GZIPDecompressorInputStream.cpp -+++ juce/modules/juce_core/zip/juce_GZIPDecompressorInputStream.cpp -@@ -77,6 +77,7 @@ - #endif - #else - #include JUCE_ZLIB_INCLUDE_PATH -+ #define z_uInt uInt - #endif - } - diff --git a/debian/patches/projucer-makegenerator.patch b/debian/patches/projucer-makegenerator.patch deleted file mode 100644 index cea73aee..00000000 --- a/debian/patches/projucer-makegenerator.patch +++ /dev/null @@ -1,125 +0,0 @@ -Description: projucer fixes - projucer creates Linux Makefiles, but they do silent builds and do not allow - to override CPP/C/CXXFLAGS. - this patch changes projucer to honor the "V" build variable, so "V=1" will - build verbosely. - it also renames *FLAGS to JUCE_*FLAGS and appends the ordinary *FLAGS to them. - . - Note: This patch is applied manually because the patched files contain spaces, - which makes problems during automated builds -Author: IOhannes m zmölnig -Origin: Debian -Forwarded: https://github.com/julianstorer/JUCE/pull/124 -Last-Update: 2015-02-10 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- juce.orig/extras/Projucer/Source/Project Saving/jucer_ProjectExport_Make.h -+++ juce/extras/Projucer/Source/Project Saving/jucer_ProjectExport_Make.h -@@ -202,15 +202,16 @@ - - void writeCppFlags (OutputStream& out, const BuildConfiguration& config) const - { -- out << " CPPFLAGS := $(DEPFLAGS)"; -+ out << " JUCE_CPPFLAGS := $(DEPFLAGS)"; - writeDefineFlags (out, config); - writeHeaderPathFlags (out, config); -- out << newLine; -+ out << " $(CPPFLAGS)" -+ << newLine; - } - - void writeLinkerFlags (OutputStream& out, const BuildConfiguration& config) const - { -- out << " LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR)"; -+ out << " JUCE_LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR)"; - - { - StringArray flags (makefileExtraLinkerFlags); -@@ -240,7 +241,8 @@ - if (libraries.size() != 0) - out << " -l" << replacePreprocessorTokens (config, libraries.joinIntoString (" -l")).trim(); - -- out << " " << replacePreprocessorTokens (config, getExtraLinkerFlagsString()).trim() -+ out << " " << replacePreprocessorTokens (config, getExtraLinkerFlagsString()).trim(); -+ out << " $(LDFLAGS)" - << newLine; - } - -@@ -269,7 +271,7 @@ - - writeCppFlags (out, config); - -- out << " CFLAGS += $(CPPFLAGS) $(TARGET_ARCH)"; -+ out << " JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH)"; - - if (config.isDebug()) - out << " -g -ggdb"; -@@ -279,6 +281,7 @@ - - out << " -O" << config.getGCCOptimisationFlag() - << (" " + replacePreprocessorTokens (config, getExtraCompilerFlagsString())).trimEnd() -+ << " $(CFLAGS)" - << newLine; - - String cppStandardToUse (getCppStandardString()); -@@ -286,8 +289,9 @@ - if (cppStandardToUse.isEmpty()) - cppStandardToUse = "-std=c++11"; - -- out << " CXXFLAGS += $(CFLAGS) " -+ out << " JUCE_CXXFLAGS += $(JUCE_CFLAGS) " - << cppStandardToUse -+ << " $(CXXFLAGS)" - << newLine; - - writeLinkerFlags (out, config); -@@ -306,7 +310,7 @@ - if (projectType.isStaticLibrary()) - out << " BLDCMD = ar -rcs $(OUTDIR)/$(TARGET) $(OBJECTS)" << newLine; - else -- out << " BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH)" << newLine; -+ out << " BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(JUCE_LDFLAGS) $(RESOURCES) $(TARGET_ARCH)" << newLine; - - out << " CLEANCMD = rm -rf $(OUTDIR)/$(TARGET) $(OBJDIR)" << newLine - << "endif" << newLine -@@ -330,6 +334,14 @@ - << "# Don't edit this file! Your changes will be overwritten when you re-save the Projucer project!" << newLine - << newLine; - -+ out << "# build with \"V=1\" for verbose builds" << newLine -+ << "ifeq ($(V), 1)" << newLine -+ << "V_AT =" << newLine -+ << "else" << newLine -+ << "V_AT = @" << newLine -+ << "endif" << newLine -+ << newLine; -+ - out << "# (this disables dependency generation if multiple architectures are set)" << newLine - << "DEPFLAGS := $(if $(word 2, $(TARGET_ARCH)), , -MMD)" << newLine - << newLine; -@@ -352,12 +364,12 @@ - << "\t-@mkdir -p $(BINDIR)" << newLine - << "\t-@mkdir -p $(LIBDIR)" << newLine - << "\t-@mkdir -p $(OUTDIR)" << newLine -- << "\t@$(BLDCMD)" << newLine -+ << "\t$(V_AT)$(BLDCMD)" << newLine - << newLine; - - out << "clean:" << newLine - << "\t@echo Cleaning " << projectName << newLine -- << "\t@$(CLEANCMD)" << newLine -+ << "\t$(V_AT)$(CLEANCMD)" << newLine - << newLine; - - out << "strip:" << newLine -@@ -375,8 +387,8 @@ - << ": " << escapeSpaces (files.getReference(i).toUnixStyle()) << newLine - << "\t-@mkdir -p $(OBJDIR)" << newLine - << "\t@echo \"Compiling " << files.getReference(i).getFileName() << "\"" << newLine -- << (files.getReference(i).hasFileExtension ("c;s;S") ? "\t@$(CC) $(CFLAGS) -o \"$@\" -c \"$<\"" -- : "\t@$(CXX) $(CXXFLAGS) -o \"$@\" -c \"$<\"") -+ << (files.getReference(i).hasFileExtension ("c;s;S") ? "\t$(V_AT)$(CC) $(JUCE_CFLAGS) -o \"$@\" -c \"$<\"" -+ : "\t$(V_AT)$(CXX) $(JUCE_CXXFLAGS) -o \"$@\" -c \"$<\"") - << newLine << newLine; - } - } diff --git a/debian/patches/reproducible-date.patch b/debian/patches/reproducible-date.patch index e425853a..3655bd27 100644 --- a/debian/patches/reproducible-date.patch +++ b/debian/patches/reproducible-date.patch @@ -8,7 +8,7 @@ Last-Update: 2015-01-21 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ --- juce.orig/modules/juce_core/time/juce_Time.cpp +++ juce/modules/juce_core/time/juce_Time.cpp -@@ -598,14 +598,20 @@ +@@ -610,14 +610,20 @@ return 0; } @@ -33,8 +33,8 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ getMonthNumberForCompileDate (dateTokens[0]), --- juce.orig/extras/Projucer/Source/Application/jucer_Application.cpp +++ juce/extras/Projucer/Source/Application/jucer_Application.cpp -@@ -130,6 +130,9 @@ - icons = new Icons(); +@@ -136,6 +136,9 @@ + tooltipWindow.setMillisecondsBeforeTipAppears (1200); } +#ifndef BUILD_DATE @@ -43,7 +43,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ bool ProjucerApplication::initialiseLogger (const char* filePrefix) { if (logger == nullptr) -@@ -142,7 +145,7 @@ +@@ -148,7 +151,7 @@ logger = FileLogger::createDateStampedLogger (folder, filePrefix, ".txt", getApplicationName() + " " + getApplicationVersion() diff --git a/debian/patches/series b/debian/patches/series index b4bc4dae..8a005d82 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,9 +1,3 @@ -no-ztypes.patch -fix-build-libpng16.patch -#MANUAL#projucer-makegenerator.patch reproducible-date.patch debian_apply-reproducible-date.patch debian_fixed-defines.patch -debian_projucer-modulepath.patch -debian_make-projucer.patch -debian_do-not-track.patch -- 2.30.2